Bug 1009154 Commit Version-2, Osmose Review-1