Merge pull request #14911 from seamuslee001/ref_prev_next_cleanup_service