Merge "Add way to add to prototype QS editing"