Issue #6921 Configuration improved and bug fixed