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