backport issues to 1.0.x branch
1 file changed