BB-1343 #resolve
BB-1275 #resolved
Merge pull request #660 from gannetson/two-small-fixes

Two small fixes