Merge pull request #13998 from demeritcowboy/fix-formRule