Almost all of the changes as per mail list
Conflict resolved