Merge "Do not add quotes around flags argument"