Code sync for time pass

I'm syncing the 611 codebase to start investigating the bug mentioned above. Now that is going to take some time to complete.