prepared for 2.7.x development