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