Some refresh bugs fixed!
Data preservation/refresh bug fixed
Merge remote-tracking branch 'origin/master'