Merge branch 'alinasava/web-dev-a' into 'master' bugfixes See merge request makerlog/web!12