Additional updates to sync to dev