Merge branch 'genete_static_values'