Merge branch 'genete_master'