Merge Master into FB (fix some UT compilation failure)