Merge "Improve FB update protocol."