Merge "Fixed removeJobsOfNonUsers to keep data consistent"