Merge branch 'zelgadis_master' into genete_master