Bug 21495: Regression in hold override functionality