Fixed type agent not working
Merge branch 'develop' into feature/notification-center