Individuals to self-identify gender under new government proposals