Merge "Include bypass whitelist in dump" into qt-dev