Also added a compatibility check for changed middleware defaults. Forwardport of d94de802 from stable/1.7.x
