Command line merge for #244