issue G#88 - Fix Docblock issues
Merge branch 'develop' into v130