transformers

b395e5e3 - finalize Marc's review comments