Remove vendor prefixes
Merge branch 'MIL-276' into staging