Merge pull request #960 from SAP/fix-remote-start