core from 2.2.29.1