Merge branch 'rest-producer' into customized