Merge. Update bug tracking.