Fixes for jipTeleport.
Merge branch 'dev-PA' into master-PA