Init Stock & Add to Stock
Merge remote-tracking branch 'origin/master' into stock