Merge "Implement rescoping messages."