[#3534299] Declaration types

Adam Shepherdrequested to merge
issue/gift_aid-3534299:3534299-declaration-types into 1.x

Closes #3534299

Merge request reports