Merged Mark's Apr 25 updates to transforms