[Starlingx-discuss] Cherry-picking bug fixes to the r/2.0 branch