feat: #3587271 Fix missing conditionally-required name field markers

Closes #3587271

Merge request reports

Loading