Updates for syncing with central [skip ci]