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