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