Fix laundry list duplication bug
Merge branch 'development' into release