Trying to clean up for ARC and merge master and dev.