qnd: Added support in multiple batch versions
qnd: added support in multiple batch versions
qnd: revert
qnd: Fixed merge issues
Merge branch 'master' of https://github.com/kaltura/server-api