Merge "Make bootstat container-friendly"