Merge "Fix hash validation in api"