Update for new design environment.
Merge remote-tracking branch 'origin/master'