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