merged now in 8.6/trunk