Merge "Extract plugin interface for QS"