#506 progress
Merge branch 'dev' into topic_comments
#506