Merge pull request #351 from TheBlueMatt/2019-07-no-instant