Revert  'Merge in updates branch'