Bid classes updated
Merge origin/master