Merge "More JIT debug data synchronisation." into pi-dev