Merge pull request #3936 from kumpera/monoclass_reorg2