Merge "Add argument to specify query flags for pm query commands"