Commit from satyam-w7 on branch-on-satyam-w7