Fixed list update bug.
Merge branch 'test' into dev