Merge remote-tracking branch 'refs/remotes/origin/bugfix-NullListItem' into dev-v3