merge trunk change into 0.10 branch (ceb8bcf0365bed6fc8168acbd50422cc41adb81f to 01944a50ce59855054b0cc05f3fe3028788c477b)