#912 reopened for master branch

#912