#913 reopened for master branch

#913