Merge "Fixing the build and upgrading the rmr version"