Merge with master
ExternalConfig places cached atoms correctly