Merge branch 'legal-boilerplate' into 'develop'