fix issue with options being null + id not configurable + id can't be set on BB so can't force it in "add"
Merge remote-tracking branch 'origin/master'