am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev

* commit '13bdaf7c9d3e4539e2db5d9f4c2bb4d8b7a8dd79':
  Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)