merge from feedhenry3 branch