reaffirming that all parties should continue to take all feasible steps and to develop modalities to ensure the protection of affected civilians, including children, women and members of religious and ethnic minority groups, and should create conditions conducive to the voluntary, safe, dignified, and sustainable return of refugees and internally displaced persons or local integration of internally displaced persons,