Merge DynFlags changes