Merge branch 'stock' into autostaging
Merge branch 'tweaks' into autostaging