Hotfix 3.18c (planning 2-1-2020)