bitherj->master v1.2.3
Merge branch 'release/v1.2.3' into develop