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