Advanced settings provision

Change-Id: Ie46d968554d33dda9d8124525802011647f1c23b