ADEN-1238 Make Rubicon hop