Merge tag '0.4' into master
am: 4edfc03559

Change-Id: I5f0a32ca9786c0d65de5f779f4c3f95637400d0f