Merge branch 'teamLocFlip'