Merge "SAP: Klocwork issue"