Merge pull request #5144 from kumpera/handle-fixes-part1