[12414] Support non-player conditions

(based on commit [12304] - dbb5018)