Deploy with branch agreement
(cherry picked from commit d1874af)