[Chance-core] Align to changes in master