Merge branches 'build-implicit-link' and 'build-jsonc' into integrate

Conflicts:
	cpp/Makefile