Merge pull request #26 from onkar-dhuri/2.2

Merge batch changes and service class related changes with 2.2
Merge remote-tracking branch 'upstream/2.2' into 2.2