Merge remote-tracking branch 'gitlab/fix-temp-var-hash-collision-on-scope-base-storage-and-aliasing' into revive-multilevel-scan
