Save user fixed - setAsText List changed to HashSet
Merge remote-tracking branch 'origin/Develop' into Develop