Hotfix rm13932 rebased