Merge "[AWARE] Add discovery window period configuration"