BS-9422, merge master into BS-9421_BizData_MultiInstance