pull request for issue SPR-7966