BZ-9257 added filter
BZ-9196 adde GWT side links
Merge remote-tracking branch 'refs/remotes/origin/master'