This updates this MR to the latest base branch (develop) and also
is an experiment on what happens when I merge instead of rebase to
update MRs.