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