Merge fixes aurora and flash