Cherry-pick of "Merge branch 'SelectionDevelopment-master-20170803' into 'master'" into 1.0

Package Selection Development, master branch (2017.08.03.)

See merge request !110 (merged)

This should be useful for the 21.X projects as well...