Merge branch 'chore/remove-reference-to-distsn' into 'develop'