Declare template vars in template header (updates #30223)
More flexible embedded map support in core (updates #30223)