Merge "[SECURITY] Fixed valgrind tool issues" into devel_3.0_main