Merge flow

[Sergey Beryozkin]

Hi Tim

What is the current process for merging the fixes ? The fix goes to the
master first and then it is cherry-picked into the branch_1x ?

Cheers, Sergey