Migrate to 4.2 and remove test resources
Merge from 4.1.2
This version don't support monkeys
Add national roaming