Merged in Raj's change and updated commit ids