Merge branch 'release/r_0527'
Merge branch 'release/140527_1'