qnd: Added support in multiple batch versions
qnd: merged changes for batch versions