BLAC-47: change name of hook method
Merge branch 'trusted-proxy' into dev