Merge pull request #530 from Ewocker/GRANITE-33782