action strategy
Merge branch 'master' into datamodel