Behaviour_Author implementation
Merge branch 'dev' into feature/theme