Merge branch 'staging' into smart-mask-alpha