Closes #1172 (closed), #1173 (closed), #1174 (closed), #1175 (closed), #1176 (closed) and #1178 (closed)