RUBY-843 Take ns into account and add cursor option to commands