Issue 8273 by sgl: Prepare to 7.x