Merge "FibManager module sync up"