CORE: refactor 43cb91fc363547d788ebae15329eb4eb806c469d