Additional changes for eb8d5e0adc67cf07c90543596b093591b98071b1