Merge branch 'feature/lua5.3-dev' into develop