Merge branch 'revert-45b58ff0' into 'master' Revert "Merge branch 'patch-1' into 'master'" See merge request makerlog/web!22