Merging a change from tp-upstream and trying a fix for the General Error