Merge "Add option to tune sample collection based on thread sensitivity"