Merges lists branch into 1.4.0