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