Resolving MainfestMerger error for v4:21.0.rc1