Merge branch 'release/52'