Merge commit 'a6bd8d1ad87a85cf402d019de5f4e01855d99b34' from release-0.9.4-pre-rc

Change-Id: I03b642f9e0ad4bdc034cd8f33b712dbb87a66f5d