Merge pull request #13455 Rochet2/ah

AH related fixes

(cherry picked from commit d924553002339a07544063784acd6241ce469986)