Merge branch 'master' into Dev-Eric
fixed an error where list was appending incorrect values
Merge branch 'Dev-Eric'