Fix #0017605: Regression issue with upgrade step 184