Fix the tagged logging and add a test.
Version bump 4.0.0.sw.5