Merge "version 4.0.9 upgrade RMR version to 3.8.2"