Merge branch '1047687-add-company-selection' into '2020.0'

#1047687 - Fixed no selection option in filter view with attribute: "organisation" & "person".

See merge request xrm/basic!119