Updates for 2.x branch.

...ws, context, and panels.