Merge #15055 with fixes

Add a check for mkmnt so that it is still honored