emarcey Merge pull request 2020PB#972 from Murkantilism/issue-898