Some check_config enhancement Upstream-commit: f28877257bf87a967509933159b16f24846338cb Component: engine