Add forgotten files from commit 97481484fe8ae1031cb49a87134f1eca09673183.
Merge branch 'master' into memory-access-3