Merge "[AWARE] Support multiple canonically identical NDP requests" into oc-mr1-dev