Merge branch 'master' into v502
5.0.2 (Raijin)