Merge "Follow FBE refactoring."