Merge "SystemProperties.set(): more exception message detail." into main