Incorporate NMU changes.