CDB-1362 #comment Ensure exceptions are rescued in User#update_gauge
CDB-1362 #comment Fix typo
Merge remote-tracking branch 'origin/CDB-1362' into release/2.7.0