Merge pull request #4426 from WoltLab/label-form-field-selection