Merge pull request #853 from micmac1/rtpe-10.5.6.3-22.03