De3347

Rebased to Maxim's develop branch.