Merge branch 'feature/versioning' into develop