Merge "Fix Klocwork issues." into devel/master