Merge branch 'multiple-tile-vendors' into release/1.3