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

Bug fixes: #137, #155, #157, #159, #165