Merge "Dependency devCtx removed from StatCtx"