Lösare koppling mellan domänobjekten
Merge origin/develop into develop