Merge "Merge dup code at thread entry and param change"