Merge pull request #638 from micmac1/rtpe-8533-21.02