[#876531] Midbar Fixes
Merge pull request #47 from daleee/#876531-midbar-fixes

[#876531] Midbar Fixes