Merge "Allow shell to set merged flag on Non enterprise config" into sc-dev