(Contributed by Heather Sutherland via Daniel Templeton) (cherry picked from commit 57194889fc39a36dc0697b29eafc4ac07ee42d00)