In theory, anything that is not related to orders like this should have been fixed in master and just back ported to 1.10, if this doesn't break things i would even say don't back port it to 1.9 and 1.10