DF-5198 update object lifetime control