Merge upto 0ce543d902