[PLAT-5109] Make batch master optional