More files from v0.8.4 port