variables-in-map-statements-fix.patch
