Fixed set on all entities.
Merge branch 'test' into dev