remove redundant return
fix indentation
release notes
Merge branch 'release/2.3.1' into develop