Merge pull request #21898 from jensschuppe/afformUndefinedIndexNotice