[#867441] Some mre review fixes.