CB-6481 Context opts should copy not reference