MLHR-1143 #resolve #comment make producer configurable
Merge branch 'siyuanh-master'