Merge master into development, fix one regression