Revert "Revert "this is a new feature""

Reverts guy-mograbi-at-gigaspaces/gs-ui-ks#2