Merge batch changes and service class related changes with 2.2