Merge pull request #4643 from metalbear-co/vladr/mc-preview-rework