Thanks,
You are right and I agree it is the right way to back-port upstream change-sets.