Merge of wrong commit from official repo

Merge from official repo.