More FDN locators
More fdn methods
Merge from origin/feature/SIM_USIM