Changes for sync between the parent repo and this one