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