Observation

Fix for fetching an entity that is not persisted.
Merge remote-tracking branch 'origin/develop' into develop