Merge "Merge "Fix potential memory leaks" am: 486cad37c6" into main-16k