Sync attention getter with upstream (#201)