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