Partially integrated high level strategy planning
Merge branch 'devchema' into devjose

* devchema:
  Partially integrated high level strategy planning