Commit from Linux 2nd time
merged from Linux