I would say anything that doesn't related to orders should not be go into 1.10 only, we will need a ticket to fix these in master and just back port them to 1.9 and 1.10