Add private comments
Merge branch 'feature/private_comments' into develop