Looking at Stream 9, these modules may come to 8.7 as well. Add just in
case. We'll remove if it's not needed.