MapResolver.java:98 is always using the first ITR-RLOC (if present) to add as a subscriber for a mapping. Instead, it should take into account the Map-Request's source RLOC and its AFI in the selection process.