framework v0.6
Merge branch 'refs/heads/framework-may22' into development