Merge "[AWARE] Correct comment on Discovery Window usage"