Merge branch 'secondary'
Merge branch 'master' into secondary
Deleted worthless comments