Merge "Restore "Late-enable" logging"