Synched with workshops
pom.xml synched
Superfluous tracer removed