Merge "Fix undefined $param"