Master images, final fixes for multi tenant.