Merge branch 'hotfix-19.1.1'
Merge remote-tracking branch 'ospalh' into develop-ospalh-special
Merge remote-tracking branch 'ospalh/develop-ospalh-special' into develop-ospalh-special