Bugfix 13042

Includes a merge of bugfix-13042.