Merge branch 'mncc-harald'