Core : Align to changes in master