Merge "Enable setting log level from command line"