From 25c662c7345d6224db7e48d5406a0144c00c4e4a Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 2 Apr 2020 11:16:56 +1100
Subject: [PATCH] Fixes for migration (#3579)