Merge "Remove plugin reference in QS"