Bugfix 12115

Includes commit from branch bugfix-12085