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