Merge backwards compatible changes before beginning destructive changes. Co-authored-by: fred.boniface <fred@fjla.uk> Reviewed-on: #1
