Merged from 0.8

Change-Id: I2274137627c3cf12bcb2514b887c1987bb9dac2a
53 files changed