Merge "RIC-398 - Fix all critical issues from static code analysis scan" into PI5