Pre-release merge from 'development' to 'test' (v1.12.1-alpha)

Milestone 1.12.1 issues