Merge branch 'barbarossa-feature' into developMacs