Merge to prod#491

Benjtalkshow wants to merge 2 commits into

productionboundlessfi/boundless:productionfrom

mainboundlessfi/boundless:mainCopy head branch name to clipboard