Merge branch 'hotfix/controller-options'

Allow setting all options via factory
Allow passing identifiers via factory
Merge branch 'hotfix/identifiers' into develop