Merge branch 'alinasava/web-dev-a' into 'master' fix overlapping Reply button on discussion page See merge request makerlog/web!9