Merge branch 'bugs/lambert' into develop