4.2.5
Merge branch 'release/4.2.5'