Merge "Storaged build file"