Changes for commit 638ee4f311