Merge "Do not replace a live phi with a dead phi." into mnc-dev