Merged from 0.8

Change-Id: I02cf4990118631fcb34846b6f84a1ccd6798021d