original commit: 3e9858b001699d9ef66d016a2ee691dacc5a8503
Some additional mred-related tweaks. original commit: fcedc30ee4787d955adab3e0e656332812685e25