Merge "Reset priority on unbond" into jb-mr1-dev