Preparation for gofer 2.0 in f21+