Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev