Merge "[Tree-wide] Make chart build process predictible"