Merge branch 'master' into genete_smart_link