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