Merge branch 'vici-ruby'