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