add some related references
Merge pull request #1069 in master
Merge pull request #1167
Merge pull request #1167 in develop