Merge "Exclude dying users when querying the list" into jb-mr1-dev