Updated to use publicFlag=true/false (or not defined for all)
Merge branch 'comment-enhance' into comment-enhancement