re #6964 test file added to test branch
Merge branch 'test/007_no_branches_from_develop' into develop