Sync with FPS head, including the following patches: