Event fix See merge request !10
Remote work From Alex:remote_work into Alex:master See merge request !9