Merge "Fix the IndexOutOfBoundsException" into udc-dev