Release of v2.3
Merge branch 'hotfix/v2.3' into develop