Cherry-pick master with cherry_test on commit 8b2019