Automation for 3.1 branch for defects MBL-10472 and MBL-10483.