Dev/grze/euca 5133 #20

Closed
wants to merge 11 commits into from