Merge "STS refactor @SecurityTest" into qt-dev