CORE: fixed merge from e1c8a09c8286d99d7115f16971067415b3b2648c