merge 0.4.7

Change-Id: I2c03f1781d32ce889579bbc29df335133b1e8fee