[bug 871023 / bug 865845] AAQ flow stuff

r?