core remaining 3.2.x