Follow-up to #3893. We've deprecated where(Specification) without introducing a proper replacement in that development line so it makes sense to refine our approach and bring a replacement to provide an alternative without the need to wait for the next major release.
