Merge "Add Aai event listener"