Merge pull request #822 from rustyswayne/1.4.0-lists

#M-372 Fixed
#M-355 Fixed