Merge "standalone demo fixes for SFC model changes"