Nothing special
Merge
Better Setting support. Supports setting inheritance for controllers and extensions.