Merge branch 'alinasava/web-dev-a' into 'master' OOF badge See merge request makerlog/web!48