Merge remote-tracking branch 'anton/abiv2' into next