Added remove method for server component
Fixed ZEN-9036 bug
Unit tests fix
Merge remote-tracking branch 'upstream/master'
Merge branch 'develop'