Direct feedback to shubhk#6676