Merge branch 'scoop-develop' into ssl-dev