Addendum to PR31124