Merge "Fix convert to fbe"