Version 2.23.3
Merge branch 'release/v2.23.3' into develop