Merge branch 'private-FindJsonCpp' into release