Merge commit '10234' into lua_err