Merge "Preparing for INT-607 Attempt to fix build"