partial #6539