RB-10.5 Backport of #1507#1509

johnhaddon merged 2 commits intoImageEngine:RB-10.5ImageEngine/cortex:RB-10.5from

murraystevenson:renderAdaptorBackportmurraystevenson/cortex:renderAdaptorBackportCopy head branch name to clipboard