Merge "QS: Remove circles and add lines"