Merge 6.1.x into 7.0.x#710

ghostwriter merged 5 commits into7.0.xghostwriter/container:7.0.xfrom

merge-up/6.1.x-into-7.0.xghostwriter/container:merge-up/6.1.x-into-7.0.xCopy head branch name to clipboard