Use the cherry picked from commit xxx tag