Merge with smack branch