Merge branch 'feature/detailview_changes_in_ui' into develop