These are mostly merges from upstream and new images/design changes