Merge remote-tracking branch 'cyberalien/ticket/11811' into develop-olympus