This issue still exists in D10. I have attached a patch for same. Please review.