Merge our fixes branch. It has a few important fixes that are needed for
futher testing and also some commits that will conflict with content in
next.