Merge branch 'fix/license-attribution' into 'develop'