Merge "Add additional configuration check"