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