Added changes from John May for feed support