Test commit for merge testing
Merge test_branch2 into test_branch