Re #9713 Clean up comments
Re #9919 Usage code with non executable python code.
Merge remote-tracking branch 'origin/feature/9713_9919_clean_up_and_usage_examples'