regression fixes and tests for fix-5119-5121 branch#1

rycerzes wants to merge 4 commits intoalbertvillanova:fix-5119-5121albertvillanova/trl:fix-5119-5121from

rycerzes:fix-5119-5121rycerzes/trl:fix-5119-5121Copy head branch name to clipboard