GUI changes
Support for 2.1.7