Merge up for changing proxy manager dependency#40

alongosz merged 2 commits intomainibexa/core:mainfrom

merge-bump-proxy-manageribexa/core:merge-bump-proxy-managerCopy head branch name to clipboard