Added project to recreate issue that we are seeing in an upgrade scenario from 3.1.6 to 3.2