mkConfig rebased with recent head