manually applied translation from 2.2.x