Mergedescriptor-settingsintomain

This branch has no changes from main