Merge "Revert "Early detection of mis-configuration (1/n)""