Merge "Change log level so output will persist across reboots" into main