Roll cherly version 0.12.3
Merge branch 'release/0.12.3' into develop