restore some accidentally deleted files
Merge branch 'hotfix/v0.2.6-3'