Merge "Fix local builds by adding CleanSpec command"