commodities cleanup
Merge commit '3ad0f0d8a519d394b228908fc9b34ed7438386c2' into next