ccbcda523f
* use ghv6 and catch errors
(cherry picked from commit 73584407d7)
* use ghv6 and catch errors
(cherry picked from commit 73584407d7)