Merge branch 'fix/normalize-activities' into 'develop'