Merge 'jgcode:jgcodeVectorBranch' for patching and testing