No changes required for 6.x