Make David T's suggested changes to ExtensionMethod, set PreSelected in workflow actions
Merge branch 'develop'