Merge "Replace deprecated File::sha1Base36 call"