Code

Merge with master to get diff fixes.