this update is just for the hotfix
Merged hotfix_993