EZP-20172: Refactored usage of X-User-Hash