RichieAHB Merge pull request #529 from guardian/rahb/deprecation