Additional comments
Merge origin/master
Minor updates