Merge from Manish Trivedi acc