AI-419 , AI-420 , AI-421 - new draft for images
Merge remote-tracking branch 'origin/version4' into version4