Restored removed docblocks in commit 4c09e71

Related to #1559 and #1558.