Merge "Move closing parenthesis from multi line if and function to own line"