Fixes #5802: Forward port patches from #5755 to technique version 2.1
Merge pull request #573 from peckpeck/dev_5802/forward_port_patches_from_5755_to_technique_version_2_1

Fixes #5802: Forward port patches from #5755 to technique version 2.1