Update widget executor service
Merge branch 'master' into groups_and_roles_together