merging upstream for Effective Forms guide content