Merge branch 'develop' into activation-meta