Separation of attributes from actors, phase 1.
Merge remote-tracking branch 'origin/master'