Merge "A1Sim changes to make it more flexible"