Merge remote-tracking branch 'origin/devel' into 338-do-not-require-the-invocation-of-get-in-factory