8.0.0. Closes #2268. Closes #2269. Closes #2270. Closes #2271