Importing changes from release-158 to dev.