Merge "Update ATOM string routines to latest"