[#876531] Midbar Fixes