[Chance core] Align to changes in master
[Shapes] Align to changes in master