Improved WIC functionality.
Merge branch 'Core'