Merge "allow command line override" into main