* fix memory leak (#10441)

* fix memory leak

* update: Using smart pointers instead of raw pointers

* update: Usinig intuitive initialization of duration (#10512)