Finished some factories that were not quite finished a few commits ago.
Merge remote-tracking branch 'origin/develop' into develop