Merge "NoMan support for FBE."