Fix conficts
Merge branch 'master' into feature-165-additional-details