Merge pull request #949 from SAP/combined-prs-branch