Recommiting changes
Merge branch 'foundation4' of https://github.com/Credda/one-ring into foundation4