BZ-9257 portfolio filter
Merge remote-tracking branch 'refs/remotes/origin/master'