refactor some code to be clearer in copy-plugin
Merge branch 'discoverable-copy-paste-for-sections' into testing