Merge "[AWARE] Enable discovery/operation on 5G" into qt-dev