A/HRC/31/14 136.186 Continue its efforts for a full implementation, in all levels, of the National Disability Strategy (Israel); 136.187 Establish a supported decision-making framework in relation with people with disabilities (Israel); 136.188 Strengthen measures concerning people with disabilities (Libya); 136.189 Continue implementing legislation to address the multiple forms of discrimination on the basis of disability (Panama); 136.190 Continue to promote and support programmes such as the Jobs Access Gateway to equip persons with disabilities with the appropriate skills to secure gainful employment (Singapore); 136.191 Strengthen measures to prevent all forms of discrimination, illtreatment or violence against persons with disabilities (Colombia); 136.192 Address on a priority basis to, at the administrative and legislative level, the issue of the detention of persons with disabilities who have not been convicted (Costa Rica); 136.193 Reinforce the measures to improve conditions of detention, especially for persons with disabilities and the young, as well as to eliminate corporal punishment (Holy See); 136.194 Prevent the indefinite detention of persons with mental disabilities (Spain); 136.195 Introduce measures to address issues related to the treatment of persons with disabilities, including considering the implementation of recommendations from both the Australian Law Reform Commission’s report on Equality, Capacity and Disability in Commonwealth Laws, and the Senate inquiry into high levels of violence and abuse of persons with disabilities in institutional and residential settings (New Zealand); 136.196 Guarantee the end of the unwarranted use of prisons for the management of persons with disabilities (Islamic Republic of Iran); 136.197 Set up a commission of National Independent Inquiry on Violence and Abuse against People with Disability (Islamic Republic of Iran); 136.198 Conduct a national independent investigation into cases of violence and degrading treatment of persons with disabilities and persons suffering from mental illness in institutions and homes for the disabled (Russian Federation); 136.199 Prevent the excessive use of force by the police and investigate all complaints thoroughly (Azerbaijan); 136.200 Intensify efforts to improve conditions in prisons, in particular to address the problem of overcrowding and the high mortality in prisons (Uzbekistan); 136.201 Ensure access to justice by all, including by repealing laws on mandatory sentencing (Botswana); 136.202 Adopt the recommendation by the Committee against Torture to review mandatory sentencing laws with a view to abolishing them (Norway); 136.203 Continue efforts to train authorities involved in the administration and handling of justice in cases that affect indigenous peoples on the human 23