Merge branch 'release/3.3a'
Minor comment fixes.
Merge branch 'hotfix/3.3b' into Development