original commit: 8e0f8dd39c3744472b450021f003f9cbe8cbcb62
Some additional mred-related tweaks. original commit: fcedc30ee4787d955adab3e0e656332812685e25