Pre-release merge from 'development' to 'test' v1.15.4-alpha