torpedo graphic
egg
Merge remote-tracking branch 'origin/graphics' into development