Support multi-instance for avoid policy, after resolving a minor conflict.