bringing fixes from v3