Clean up the logic for setting the DataSelection properties from the
children data choices
check the level changes before setting the property
Merge remote-tracking branch 'origin/master'
check the level changes before setting the property
Misc for formula in the bundle