new version 2.3
Merge branch 'release/2.3'
Merge tag '2.3' into develop

2.3
fixed NPEs