Merge branch 'feature/syncLuaTravis' into develop