Merge branch 'mc5', fixes bug #590165