Merge "Change hashing technique SHA-256"