merge feedhenry3 branch