Fixes #10515 - Implementation of iAH