Code change from packaging-PREVIEW branch
Merge branch 'packaging' into packaging-ATMOSPHERE