RUBY-475 in progress