Merge "Fix required config validation"