Merge pull request #823 from rustyswayne/1.4.0-lists

#M-355 Fixed
#M-374 Fixed