Merge "Adopt sampling parameter"