Merge branch 'develop', various fixes, agent top module reworked, WiP agent
Merge branch 'master' into develop