Merge pull request #15590 from alifrumin/subjecthelp