Disabled factory for now

Change-Id: I09d71d46906216b87b09da526a33133031272f84
Merge branch 'hotfix-0.1.1'

Change-Id: Iacff70565a655c698aef0e1dfe05d98ebce7df35