#3401 fix in 2.0.13 release branch as well