back ports entity service updates