Merge "[Security] Fixed build warnings" into devel_3.0_main