first change with merge skeleton
Merge branch 'lan_branch'