For ENG-4274, backport heartbeat deployment fix