Merge "Fix flag in QSSecurityFooter" into tm-dev