4.0 breaking changes. Closes #1560, closes #1559, closes #1558