Insert configuration settings check

Change-Id: Ia10f553c8c13c5601dd0473fe95de04ddfaf63e8
Merge "Insert configuration settings check"