Cleaning up some "old" stashes. Not sure if these changes are still relevant,
will review them at some point.
Merge branch 'devel' into feature/staging
sync with devel
fix undefined variable in agent
resolve conflicts from merge from devel