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