Master branch comments
Merge branch 'master' into smartlink_svr