Imported changesets 6ad7cf34a8f5, d535941636f3, f3a4422f7b1a from the default branch