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

favionc work