Merge Sprint 31 hotfix branch

This branch includes the fix for #5279. @gruehle