Remote work fix basket See merge request !25
Remote work merge request From Alex:remote_work into Alex:master See merge request !24