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