Closes #2364 (closed) Related #2166 (closed) Closes #2001 (closed) Closes #2223 (closed) Closes #1907 (closed)