Marking this bug as won't fix as Dustin mentioned that merging from the current branch is working well.
Marking this bug as won't fix as Dustin mentioned that merging from the current branch is working well.