issue #12850

multi-site support fixed