Merge branch 'develop' into lbudginas/#407_add_comment_type_filter