Merge branch 'scripting-python' (early part) into screen-scripting-soc