merge: branch 'bg/bond-options-rh1299103'