Merge "[AAI] Testing a revert of v26 to v24"