Merge "[AWARE] Defer requests received while terminating an NDP" into oc-mr1-dev