Merge "Initial patch to begin adding support for Magnum."