Deeplink and JDM changes
Merge branch 'mortendev' into vm-dev