merge: integrate snapshot branch with logging cleanup