* r21 compatibility, still compatible w/ 20.7
	* tagging 00-03-07


Former-commit-id: fcee80435531d60966852d45c48c42dcbff96693