Amend all relevant legislation so as to incorporate fully the principles of gender equality and prohibition of discrimination based on gender, covering direct and indirect discrimination in both the public and private spheres, and take all necessary measures in order to enforce such principles