Merge branch 'less_update'