Merge "Update codebase with static analysis result"