Merge pull request #738 from asw101/upgrade-rmcp-3.1