v4.0.1 update

Change-Id: I2db244aa834b67d0d9096dad1ba947cffbf9a8e4