Port #512 and #522 to stable#523

justinvdm merged 2 commits intostableredwoodjs/sdk:stablefrom

port-522-to-stableredwoodjs/sdk:port-522-to-stableCopy head branch name to clipboard