Merge pull request #3486 from weiznich/backport_fixes

Backport fixes