[PATCH conductor] Integrating Mustache (rev. 2)