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