Merge branch 'genete_smart_link_master'