hotfix 1 for 2.3.0
Merge branch 'hotfix_2.3.0'