Bug 22043: (QA follow-up) Add parameter to control behavior