Merge pull request #13440 from Rochet2/ahbot

Core/AH: AHBot related fixes

(cherry picked from commit 248847290ae11478d51decdc605691311dc934c5)