new arrow class
Merge commit 'e39d2e095862a030bf9fc22812e96cb48dd57288'