sync with master after #656 was merged into master branch rather than develop branch