Merge "Validate zen policy/filter agreement" into qt-dev