Merge "API: Cleanup around comment/reason params"