osc: cleanups
Merge remote-tracking branch 'origin/lua_experiment' into lua_experiment