Merge "change dirty logs to work off a whitelist"