- Add in the map expiry patch
    - Bring in other patches that have been committed to other branches. This
        version should now contain all fixes we have to date
    - Merge conflicts due to map expiry changes