Issue 19966: validation working again