Merge "dist for dist_files"