am a728543a: Merge "Fix a couple small bugs (issue 6539339)" into jb-dev

* commit 'a728543a34e4095dfd1f661dfd3dd6d2ccbca657':
  Fix a couple small bugs (issue 6539339)