Added more comments placeholders
Merge branch 'master' into proxy