Merge "Some QS refactoring"