ENG-6475, new version based off binary log shipping branch