Fix merge conflicts
Merge branch 'release/4.5'