re-merged in Kiran changes