Merge "Add stored queries for port mirroring"