Add --show_derivations_mask to control what to print when --show_derivations
Merge branch 'xml' into everything