Jeff - cascade commodity to stock item
Jeff - merge conflict
Jeff - merge conflict