Develop - Fix for Issue #1750 - Move device creation back to before ApplyChanges is called.