Split out of #37344.
Co-authored-by: Dmitry V. Levin <ldv@altlinux.org> Resolves: #15055
Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>