Merge branch 'master' into synth-names-and-canonicalize

Signed-off-by: Eder Monteiro <[email protected]>

Author: eder-matheus