Fixed market prices
Merge origin/master