Merge branch 'price_change2'