Merge "Continue inline reply prototype"