Minor updates
Updated advancedsettings.xml
Merge remote branch 'upstream/development' into development