Merge branch 'master', remote-tracking branch 'origin' into lan_branch
checkpoint