Merge branch '2078-list-fixes' into 'develop'