Fix #6913 - add more documentation to code