activity could be empty for creation but not for update
Merge branch 'versioning' into 0.1