Merge pull request #1162 from FioraAeterna/fixmerges JIT: fix bugs with ComputeRC in branch merging patch
