Break from refactoring.
Merge branch 'feature_BidRecorder'