[MD] More resourcepool merge fixes