Support latest redundant-manager#2