Merge branch 'hotfix/0.2.3'
move ephemeral storage from tests to storage
Merge branch 'hotfix/0.2.4' into develop