Merge branch 'dsa-global-cosmetics'