CODE-30: Add the fix for PAHMA-462.