Code update CORE-362