Extending the Transformer classes to avoid api breaks in this version
Merge remote-tracking branch 'origin/master'