C17 fixed fb issues in rebase