Hotfix 3.12b 


Planning: 17-6-2019