Applies to Q2A ‘internal’ users (already exists for external users).
External user version updated to handle flags.