Merge branch 'master' into genete_core_review