Merge branch 'hotfix/903'

Close #903
The factory must return a result or else there is a error
Merge branch 'hotfix/929' into develop

Forward port #929