Merge branch 'alinasava/web-dev-a' into 'master' fix user's task https://getmakerlog.com/@tyuans breaking site See merge request makerlog/web!16