Merge "Support comments option in query command"