Small fix to this. Will resubmit a squashed PR.
Merge branch 'patch-member-addresses' into custom-aplus2