Merge remote-tracking branches 'origin/cleanup/whitespace-1', 'origin/build-implicit-link' and 'origin/build-jsonc' into integrate

Conflicts:
	cpp/Makefile