issue #21442: site default bugfixes