Changes needed for Cherry-Pick extension

/cc @johnregan3