Merge branch 'staff-plug' into 'develop'