Merged with MOB-1392-intmap-extension