1.6.0.9 Beta Testing

Changes since `1.6.0.8` to be merged into `beta` branch for testing.