EXDE redesign task #308