allow to get gateways and actions as array
Merge branch 'develop'