files from Speak Factory
merge from master, keep all changes to old files
Merge pull request #1696 from ORCID/speakFactory1

Files from Speak Factory