Delrifai/#433 3 unify no results

Dima Rifairequested to merge
delrifai/#433_3_unify_no_results into develop

Hi Mohammad the new branch is delrifai/#433_3_unify_no_results

Merge request reports