Closes #1408, Closes #1409, Closes #1387, Closes #1410, Closes #1411, Closes #1412, Closes #1413, Closes #1414