Issue #3104922 by greg.1.anderson, Mile23, alexpott: Guard against changes to Scaffold Plugin that might cause upgrade problems