docs: Add some docblocks
Merge remote-tracking branch 'origin/master'
docs: Update docblock headers