combined images on client
Merge remote-tracking branch 'CloudWeek4/master'