Merge "Change raw pointer to unique_ptr" into devel/master