Merge branch 'noc-1866' into 'master'

#1866 Add filterProtected attribute to UI labelfield fir Filter fields.

See merge request !6427

(cherry picked from commit 0233985f)

b917142c Add filterProtected attribute to UI labelfield fir Filter fields.
026916c2 Fix if.
9a467e5b Fix typo.
3 jobs for !6430 with cherry-pick-0233985f in 1 minute and 35 seconds (queued for 6 seconds)
latest merge request