Merge "Replace hard coded parentheses"