Merge with smack branch

No match.