Merge branch 'graphite_producer' into develop