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

v0.2.6-3