Issue #12094. Added settings