Return of IDPs to be ensured before November 2016