Merged changes to feed transformer