Merge "add a mechanism for logging actions"