Merge branch 'master', remote branch 'origin'
core 3.1.2.5 - 3.1.2.7