Before we upgrade our changes to M10, we need to merge the M8 changes into master. This PR addresses that concern.
