Bugfix 12699 develop