Merge J2 with Test Commit Message