Version v0.7-pre-clean-dev-i