-- MTE-40, Added upgrade code to handle #2 in https://jmaltd.atlassian.net/browse/MTE-40