Merge "Add basic logic for new platform compatibilty framework."