Greengrass Recipe Variables in Component Configuration (Nucleus 2.7.0)

I’m attempting to use the recent Greengrass Nucleus feature to interpolate component configurations that include recipe variables. I have a Lambda component that subscribes to an MQTT topic with the thing name in the topic, e.g.:

"componentLambdaParameters": {
    "eventSources": [
        {
            "topic": "{iot:thingName}/suffix",
            "type": "IOT_CORE"
        }
    ]
}

This fails for me when a Core Device is receiving its first deployment that includes the Nucleus configuration along with the other components. The component configuration, as seen via the Greeengrass CLI, shows the un-interpolated value exactly as above. I wonder if it’s because the same deployment is also merging the "interpolateComponentConfiguration": true Nucleus option, such that the option hasn’t taken effect by the time the configuration for the Lambda component is consumed?

If I break it up into two deployments, one that deploys the Nucleus configuration update and all components that don't use the interpolation feature, and a followup deployment that adds the Lambda component with the configuration above, then it works.

Is there anything I can do to make it work as a single deployment?