Merge "Log as warning when persistent setting file doesn't exist" into main