Merge branch feature/rest-activities into develop