Merge commit 'e6587f628a72f10594e676ec375c1cf26e73ec53' from release-0.9.4-pre-rc into master

Change-Id: I6f23feac3c249745d561359b117cf1e0d573942a