Merge "Add atom optimization flags"