Merge "Fix constructor parameters shadowing member variables"