Merge pull request #4892 from lioncash/control Control: Convert raw pointer parameter into unique_ptr
