Merge branch 'develop' into lbudginas/#428_comment_search_operation_type_search_trigger