[stable-2.1] Port #1714 and #1736#1740

prashant-gurung899 wants to merge 2 commits intostable-2.1opencloud-eu/web:stable-2.1from

port-commitsopencloud-eu/web:port-commitsCopy head branch name to clipboard