CON-1977: Options repositioning