Merge pull request #816 from rustyswayne/1.4.0-lists

#M-362 Fixed
#M-364 Fixed