CDB-3718 More log changes