Merge remote branch 'limansky/dia-images'