port commit 1600954 to master