re-sync v3-fixes