Fix STS-3456
Merge branch 'post_release'