Merge pull request #23177 from JMAConsulting/booleanFields_1