release branch fix
(cherry picked from commit c6e00c6825509bb56dcafea2947e89b7b9e396b3)