#910 reopened for master branch

#910