Merge "Prevent a 4-way binder interlock leading to a leak." into qt-dev