Please merge to the release branch (cherry picked from commit 50dba41043)
50dba41043
#:fail' option to