CROSS-1208: Release PLF4 Alpha1
Merge branch 'master' into feature/activity-type