KFSUPGRADE-985 Add changes from 5.2.1 to fixx exception when creating
PREQ