Merge "simapp integration with aiab"