Merge "System MR2: Fix bug on onTransfer and on getting initial routes" into sc-dev