updated 2.2 RE APi to be cherrypicked to go to prod