Backport MBR / 4K bugfix for 9.2