Sync with FMJ upstream b98c2266c23eb64745a99d255b651dde6d9a8171