Prepare for downmerge to Rel20