Merge branch 'feature/CFD-149-Group_dashboard_Header' into Branch_tests_failing_due_PHP_memory_limit