Merge branch 'develop' into lbudginas/#511_add_total_count_for_results