Merge "Add atomic method reference map"