memo modification & remove unused imports
Merge remote-tracking branch 'origin/origin' into origin