Fix issues with embroider-optimized
scenarios.
#1221
Merged
embroider-optimized
scenarios.
#1221