Merge "Fix caching runtime toggle" into sc-dev