Merge branch 'master' into master-table

Change-Id: I80c55df33a8f07cb93a52756fd8a36278e749ce0