Added in v1.6017