Hotfix 2
Merge branch 'hotfix-error435' into STABLE