[AS7-444] fix problems from rebase
Temp commit: Get rid of the original hashing implementation