* fixes #12150 * reworked from !15083 * part of #12404 * part of #11104 * enable tests * take over maintainership