Merge "Add settings intelligence config" into tm-dev