Changes for moving to AG upstream